From c94ab433caf345ebc6bef9a7174d1f65f676fc87 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 30 Apr 2025 17:18:17 -0700 Subject: [PATCH] tang: update to 15 Rebase patch Signed-off-by: Rosen Penev (cherry picked from commit b0832919411088a4deedf6b21478fecf3119ee22) --- utils/tang/Makefile | 6 +++--- .../patches/100-tang-show-keys-use-wget.patch | 20 +++++++++++++------ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/utils/tang/Makefile b/utils/tang/Makefile index feca121b8e..4abb7a65a5 100644 --- a/utils/tang/Makefile +++ b/utils/tang/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tang -PKG_VERSION:=14 -PKG_RELEASE:=4 +PKG_VERSION:=15 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=04263ed1cc98d60cab29fe47f908921b7b1aa4d6da5f9de2fcbe543773b75886 +PKG_HASH:=eaf4a2abfea3d05f454a8841e98332be1e1e2432744c70bb7765651ed82c3f7c PKG_MAINTAINER:=Nikos Mavrogiannopoulos PKG_LICENSE:=GPL-3.0-or-later diff --git a/utils/tang/patches/100-tang-show-keys-use-wget.patch b/utils/tang/patches/100-tang-show-keys-use-wget.patch index 1b3b682fb8..e79d2faa8f 100644 --- a/utils/tang/patches/100-tang-show-keys-use-wget.patch +++ b/utils/tang/patches/100-tang-show-keys-use-wget.patch @@ -1,16 +1,24 @@ -diff --git a/src/tang-show-keys b/src/tang-show-keys -index 0c33c3a..4b64bda 100755 --- a/src/tang-show-keys +++ b/src/tang-show-keys -@@ -25,9 +25,9 @@ if [ $# -gt 1 ]; then +@@ -25,17 +25,17 @@ if [ $# -gt 2 ]; then exit 1 fi -port=${1-80} +port=${1-9090} --adv=$(curl -sSf "localhost:$port/adv") -+adv=$(wget -qO- "http://127.0.0.1:$port/adv") + if test -n "$2"; then + first_letter=$(printf %.1s "$2") + if [ "${first_letter}" = "/" ]; then +- adv=$(curl -sSf "localhost:$port$2/adv") ++ adv=$(wget -qO- "http://127.0.0.1:$port$2/adv") + else +- adv=$(curl -sSf "localhost:$port/$2/adv") ++ adv=$(wget -qO- "http://127.0.0.1:$port/$2/adv") + fi + else +- adv=$(curl -sSf "localhost:$port/adv") ++ adv=$(wget -qO- "http://127.0.0.1:$port/adv") + fi THP_DEFAULT_HASH=S256 # SHA-256. - jose fmt --json "${adv}" -g payload -y -o- \ -- 2.30.2